Arm platforms: Remove common RAS configuration source

The file arm_ras.c intended to provide common platform-specific RAS
configuration for Arm platforms. Because this file has symbol
definitions, it's proving difficult to provide a common definition.

This patch therefore renames and makes the file specific to FVP. Other
platforms shall provide their own configuration in similar fashion.

Change-Id: I766fd238946e3e49cdb659680e1b45f41b237901
Signed-off-by: Jeenu Viswambharan <[email protected]>

diff --git a/plat/arm/board/fvp/aarch64/fvp_ras.c b/plat/arm/board/fvp/aarch64/fvp_ras.c
new file mode 100644 (file)
index 0000000..fb80a8a
--- /dev/null
+++ b/plat/arm/board/fvp/aarch64/fvp_ras.c
@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) 2018, ARM Limited and Contributors. All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#include <ras.h>
+
+struct ras_interrupt fvp_ras_interrupts[] = {
+};
+
+struct err_record_info fvp_err_records[] = {
+};
+
+REGISTER_ERR_RECORD_INFO(fvp_err_records);
+REGISTER_RAS_INTERRUPTS(fvp_ras_interrupts);

diff --git a/plat/arm/board/fvp/platform.mk b/plat/arm/board/fvp/platform.mk
index 3a2873339eb3941a35ff1f2cbf0f5f34bedb1dd6..ed41d4cb8606544c1cc5c73881d796802e22446d 100644 (file)
--- a/plat/arm/board/fvp/platform.mk
+++ b/plat/arm/board/fvp/platform.mk
@@ -216,6 +216,10 @@ BL31_SOURCES               +=      lib/cpus/aarch64/cortex_a75_pubsub.c    \
                                lib/cpus/aarch64/cpuamu_helpers.S
 endif
 
+ifeq (${RAS_EXTENSION},1)
+BL31_SOURCES           +=      plat/arm/board/fvp/aarch64/fvp_ras.c
+endif
+
 ifneq (${ENABLE_STACK_PROTECTOR},0)
 PLAT_BL_COMMON_SOURCES +=      plat/arm/board/fvp/fvp_stack_protector.c
 endif

diff --git a/plat/arm/common/aarch64/arm_ras.c b/plat/arm/common/aarch64/arm_ras.c
deleted file mode 100644 (file)
index 80dfaf1..0000000
--- a/plat/arm/common/aarch64/arm_ras.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright (c) 2018, ARM Limited and Contributors. All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#include <ras.h>
-
-struct ras_interrupt arm_ras_interrupts[] = {
-};
-
-struct err_record_info arm_err_records[] = {
-};
-
-REGISTER_ERR_RECORD_INFO(arm_err_records);
-REGISTER_RAS_INTERRUPTS(arm_ras_interrupts);

diff --git a/plat/arm/common/arm_common.mk b/plat/arm/common/arm_common.mk
index 76a75d3b944dde69b47b4e988f8c3844f5b0033e..533084708063a9d9c525568eca5957bac561000a 100644 (file)
--- a/plat/arm/common/arm_common.mk
+++ b/plat/arm/common/arm_common.mk
@@ -236,8 +236,7 @@ endif
 # RAS sources
 ifeq (${RAS_EXTENSION},1)
 BL31_SOURCES           +=      lib/extensions/ras/std_err_record.c             \
-                               lib/extensions/ras/ras_common.c \
-                               plat/arm/common/aarch64/arm_ras.c
+                               lib/extensions/ras/ras_common.c
 endif
 
 ifneq (${TRUSTED_BOARD_BOOT},0)